Close #150 Fix messy about layout