Home: Fix space issues