Layout Changes and move javascript to script folder.