Refactored panels.
Small changes.