Updated pages and functionality

Just an update