Improved layout, alligned the hacks in the other gb