Major updates to theme and layout