Added proper ordering, various style updates