Basic styling commit + minor functionality