Better error handling and moving sidebar elements around.