income layout finished
add database classes