Updated layout and removed hard-coded strings