Home Screen rework