Changed theme and layout a bit more