Jose Hernandez

Model and Layout Cleanup