Temp commit - Completed borders, fix issues