Added initial screen layout
Removed hardcoded string values