Some bug fixing and total fixed styling.