Add HomePAGE + Refactor UI