Added separator and recycle bin. Cleaned up dock code some.