Fixed alert positioning and cleaned up minor stuff