Homepage Draft

Some cleaning up in id names.