Refactor templates to use a base template
Use bootstrap to improve layout