CLeaning up and fixing layout