Great code refactring, table view now binding based instead of manual