Added UI views and controllers + some eye-candy