Sub navigation finished, layout adjustments added