some thanges on layout and templates moved to the right apps