Small changes and improvements

Basically little changes to the markup and styles.