Add polyfills and reorg app layout