some modification in layout structure to make it more
managable