added settings layout and username handling
merged luka