Worked on UI

Layout of Components improved