Page complete minus pretty ui and a few small bugs