Re factoring my home page