Added borders, small bug fixes