Clean Up & Updates

Layout updates, raw input validation