Fixed layout. Added exception handling (pretty much). And that should be all i guess