updated android & web layouts

responsive and more modular templates for android and desktop web apps