Various small adjustments
Updated todo list
Added new controls for data page - need more implementation