design tweaks and working on consolidating fees