Various improvements
Fixing code
Fixed somre more layout issues