Add bootstrap, refactor initial app