Small layout fixes and some nephewness. Fix #105