enhanced formatting and fixed some views