Major Bug fix update

Loads of minor errors taken care of. Alignment of the screen has been
sorted