starting to add user logic | layout improvements | few fixes