improving layout
chages done during the class