Updated spacing and overall look (though still simple and crummy!)