Fixing some layout issues and making ui pretties
Merge remote-tracking branch 'origin/uiFixes' into bug_fixes_for_details