Bug fixes + View Controller implementation.