Updated code to improve display using bootstrap, also updated html template