Added bootstrap and cleaned up the UI