Improve theme and add header