Layout improvement Semaphore; mostly adding @Override annotation.