Space bug fix, better looking