Removed unused js, changed layout