hi!
i had done all the changes you asked for kindly check my last design and provide feedback or let me know if you still looking for the design.
regards!