Layout fixes and another level to be made
Final version