Updated with homepage finished