Some cleanup.
Merge pull request #156 from tsherif/cleanup

Some cleanup and added volume_id to panels.