Refactored
Style update to full bootstrap