Gutted more template and testing structure

Test on larger screen ASAP