Fixed some minor issues

Layout, method naming and 3 tiny bugs