Adding Text and fixing layout