Added scroll bars and better resolution support