Improve layout + add glyphicons