Modified home page logic; Cleaned project