templates restructurised
css fix