Big layout update
Merge pull request #50 from EndOf/Kam1x_b

Big layout update