NPE fix + header layout adjustments

http://i.imgur.com/UYRQ8OU.png