Modified some things in layout