First version of changes for using bootstrap