Fixed some layout issues. Added borders.