minor bug & layout fixes