Layout fixes, added top border