Fix header offset and prepare for material design