Fixed bug on ubo allocation, formatting fixes