Fixed Adding to look and feel how we wanted