Last minute bug submitted.

All the bugged squashed.
some small css work around.