Fixed class structure, adjust title aligment and other little fixes.