Feature #43, refactored views in order to implement bootstrap