sidebar added. needs more content.
conflicts fixed