Change layout

Added a more dynamic layout