Change: layout and theme overhaul