Added improved title helper
Finished layout