Changed layout and added scripts