Fixed styling/structur, but functionality remains the same.