#28 Handle login on service level, UI part is not completed yet
Merge of layout changes with latest task implementation