Fixed mutiple bugs, renamed classes to CamelCase, removed unneeded layouts