Issue #5 + some minor styling