Updated model and added Bootstrap