Did some more changes on UI pages