Fix/ui cleanup home