Sixth Commit

Mainly working on the online screens.