Added a few fixes and removed borders