First part refactor for bootstrap, style and other tweaks