Cleaned up code
Updated to Bootstrap 3