Finish Bootstrap UI Cleanup